From: Giovanni Campagna <scampa.giovanni@gmail.com>
Date: Tue, 3 Mar 2015 08:30:01 +0000 (-0800)
Subject: NotificationDaemon: stop filtering notifications from empathy
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1590
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8eb236ae419e79fc1d979bdc930d0e4f395e0d22;p=gnome-shell.git

NotificationDaemon: stop filtering notifications from empathy

Now that we don't have our own code for showing telepathy
notifications, we don't need to filter out empathy's.

https://bugzilla.gnome.org/show_bug.cgi?id=745503
---

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 8d470c9cf..9e942b46f 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -212,13 +212,10 @@ const FdoNotificationDaemon = new Lang.Class({
 
         // Filter out chat, presence, calls and invitation notifications from
         // Empathy, since we handle that information from telepathyClient.js
-        if (appName == 'Empathy' && (hints['category'] == 'im.received' ||
-              hints['category'] == 'x-empathy.im.room-invitation' ||
-              hints['category'] == 'x-empathy.call.incoming' ||
-              hints['category'] == 'x-empathy.transfer.incoming' ||
-              hints['category'] == 'x-empathy.im.subscription-request' ||
-              hints['category'] == 'presence.online' ||
-              hints['category'] == 'presence.offline')) {
+        //
+        // Note that empathy uses im.received for one to one chats and
+        // x-empathy.im.mentioned for multi-user, so we're good here
+        if (appName == 'Empathy' && hints['category'] == 'im.received') {
             // Ignore replacesId since we already sent back a
             // NotificationClosed for that id.
             id = this._nextNotificationId++;